Merge from trunk
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 18 Nov 2011 17:57:31 +0000 (09:57 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 18 Nov 2011 17:57:31 +0000 (09:57 -0800)
commit1fd9556a2353c9c0afff0eb1778714eb51e945e7
tree759ab7640215f904320357831d9d0394c3787ed3
parentec69144c78103efa39abdd9c5de27f576edd8a02
parent5082d84f96e5e26f6fb3f2d7f03c34738a058d91
Merge from trunk